Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 9 Jan 2010 09:37:44 +0000 (09:37 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 9 Jan 2010 09:37:44 +0000 (09:37 +0000)
commit0f25ba97442969e5423ab8a3d5e4593618056d9d
treeb09735d05ba26b7abf83287fac3c619501c93cf2
parent9aaa5bc62a717b6f29b90bff59b06ab3848e0d74
parentf10177f49a3ea9cf164faeaa72b3f1d0406056d2
Merge from mainline.